projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
541b596
)
* lisp/json.el (json-read-keyword): Revert previous change to catch EOL.
author
Mark Oteiza
<mvoteiza@udel.edu>
Fri, 15 Sep 2017 19:37:25 +0000
(15:37 -0400)
committer
Mark Oteiza
<mvoteiza@udel.edu>
Fri, 15 Sep 2017 19:38:44 +0000
(15:38 -0400)
lisp/json.el
patch
|
blob
|
history
diff --git
a/lisp/json.el
b/lisp/json.el
index b13ec781b484d1b5e8cfa47f3555ca1319b33ec3..d5f05fed95f7fa281e42a157175fcb8d9d4b7669 100644
(file)
--- a/
lisp/json.el
+++ b/
lisp/json.el
@@
-305,7
+305,7
@@
KEYWORD is the keyword expected."
(json-advance))
keyword)
(json-skip-whitespace)
- (unless (
memq (following-char) '(?\] ?, ?})
)
+ (unless (
looking-at "\\([],}]\\|$\\)"
)
(signal 'json-unknown-keyword
(list (save-excursion
(backward-word-strictly 1)